--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
Commit 42377606803915aad6036b53812a479db202b8fa
Parents : 9dbba03
Author : Mark Qvist <mark@unsigned.io>
Date : 2022-01-14T10:51:40+01:00
Revert types
Changes
3 files changed, 24 insertions(+), 24 deletions(-)
Diff
diff --git a/Config.h b/Config.h
index 89f419f..b03d672 100644
--- a/Config.h
+++ b/Config.h
@@ -4,7 +4,7 @@
#define CONFIG_H
#define MAJ_VERS 0x01
- #define MIN_VERS 0x15
+ #define MIN_VERS 0x16
#define PLATFORM_AVR 0x90
#define PLATFORM_ESP32 0x80
diff --git a/RNode_Firmware.ino b/RNode_Firmware.ino
index 8921fd9..ce165e3 100644
--- a/RNode_Firmware.ino
+++ b/RNode_Firmware.ino
@@ -363,7 +363,7 @@ void transmit(uint16_t size) {
LoRa.beginPacket();
LoRa.write(header); written++;
- for (int i=0; i < size; i++) {
+ for (uint16_t i=0; i < size; i++) {
LoRa.write(tbuf[i]);
written++;
@@ -400,7 +400,7 @@ void transmit(uint16_t size) {
LoRa.beginPacket(size);
}
- for (int i=0; i < size; i++) {
+ for (uint16_t i=0; i < size; i++) {
LoRa.write(tbuf[i]);
written++;
@@ -422,7 +422,7 @@ void serialCallback(uint8_t sbyte) {
if (!fifo16_isfull(&packet_starts) && queued_bytes < CONFIG_QUEUE_SIZE) {
uint16_t s = current_packet_start;
- int e = queue_cursor-1; if (e == -1) e = CONFIG_QUEUE_SIZE-1;
+ int16_t e = queue_cursor-1; if (e == -1) e = CONFIG_QUEUE_SIZE-1;
uint16_t l;
if (s != e) {
diff --git a/Utilities.h b/Utilities.h
index 8589491..129ab73 100644
--- a/Utilities.h
+++ b/Utilities.h
@@ -210,10 +210,10 @@ int8_t led_standby_direction = 0;
}
#endif
-void escapedSerialWrite(uint8_t vbyte) {
- if (vbyte == FEND) { Serial.write(FESC); vbyte = TFEND; }
- if (vbyte == FESC) { Serial.write(FESC); vbyte = TFESC; }
- Serial.write(vbyte);
+void escapedSerialWrite(uint8_t byte) {
+ if (byte == FEND) { Serial.write(FESC); byte = TFEND; }
+ if (byte == FESC) { Serial.write(FESC); byte = TFESC; }
+ Serial.write(byte);
}
void kiss_indicate_reset() {
@@ -327,10 +327,10 @@ void kiss_indicate_frequency() {
Serial.write(FEND);
}
-void kiss_indicate_random(uint8_t vbyte) {
+void kiss_indicate_random(uint8_t byte) {
Serial.write(FEND);
Serial.write(CMD_RANDOM);
- Serial.write(vbyte);
+ Serial.write(byte);
Serial.write(FEND);
}
@@ -474,22 +474,22 @@ bool eeprom_info_locked() {
void eeprom_dump_info() {
for (int addr = ADDR_PRODUCT; addr <= ADDR_INFO_LOCK; addr++) {
- uint8_t vbyte = EEPROM.read(eeprom_addr(addr));
- escapedSerialWrite(vbyte);
+ uint8_t byte = EEPROM.read(eeprom_addr(addr));
+ escapedSerialWrite(byte);
}
}
void eeprom_dump_config() {
for (int addr = ADDR_CONF_SF; addr <= ADDR_CONF_OK; addr++) {
- uint8_t vbyte = EEPROM.read(eeprom_addr(addr));
- escapedSerialWrite(vbyte);
+ uint8_t byte = EEPROM.read(eeprom_addr(addr));
+ escapedSerialWrite(byte);
}
}
void eeprom_dump_all() {
for (int addr = 0; addr < EEPROM_RESERVED; addr++) {
- uint8_t vbyte = EEPROM.read(eeprom_addr(addr));
- escapedSerialWrite(vbyte);
+ uint8_t byte = EEPROM.read(eeprom_addr(addr));
+ escapedSerialWrite(byte);
}
}
@@ -500,21 +500,21 @@ void kiss_dump_eeprom() {
Serial.write(FEND);
}
-void eeprom_update(int mapped_addr, uint8_t vbyte) {
+void eeprom_update(int mapped_addr, uint8_t byte) {
#if MCU_VARIANT == MCU_1284P || MCU_VARIANT == MCU_2560
- EEPROM.update(mapped_addr, vbyte);
+ EEPROM.update(mapped_addr, byte);
#elif MCU_VARIANT == MCU_ESP32
- if (EEPROM.read(mapped_addr) != vbyte) {
- EEPROM.write(mapped_addr, vbyte);
+ if (EEPROM.read(mapped_addr) != byte) {
+ EEPROM.write(mapped_addr, byte);
EEPROM.commit();
}
#endif
}
-void eeprom_write(int addr, uint8_t vbyte) {
+void eeprom_write(int addr, uint8_t byte) {
if (!eeprom_info_locked() && (addr >= 0) && (addr < EEPROM_RESERVED)) {
- eeprom_update(eeprom_addr(addr), vbyte);
+ eeprom_update(eeprom_addr(addr), byte);
} else {
kiss_indicate_error(ERROR_EEPROM_LOCKED);
}
@@ -565,8 +565,8 @@ bool eeprom_hwrev_valid() {
bool eeprom_checksum_valid() {
char *data = (char*)malloc(CHECKSUMMED_SIZE);
for (uint8_t i = 0; i < CHECKSUMMED_SIZE; i++) {
- char vbyte = EEPROM.read(eeprom_addr(i));
- data[i] = vbyte;
+ char byte = EEPROM.read(eeprom_addr(i));
+ data[i] = byte;
}
unsigned char *hash = MD5::make_hash(data, CHECKSUMMED_SIZE);
──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────